Git Issue

1. Your local changes to the following files would be overwritten by merge:

2. error: you need to resolve your current index first

3. error: Pulling is not possible because you have unmerged files.