I did not find much success in understanding what this means in other SO questions.

this is for a ruby on rails project. it's probably really straightforward if you know what to do. I tried merging two branches and this was (part) of the result.

```
CONFLICT (rename/delete): db/migrate/20160705073411_create_building_employees.rb deleted in HEAD and renamed in user-authentication. Version user-authentication of db/migrate/20160705073411_create_building_employees.rb left in tree.
Removing app/models/buildings_user.rb
Automatic merge failed; fix conflicts and then commit the result.

```

* There were a tonne of files which were marked as "modified"
* there was one 'unmerged' path. Namely:

> 
> added by them: db/migrate/20160705073411\_create\_building\_employees.rb
> 
> 
> 

when I opened up the file i saw nothing to really resolve. there were no asterix running across the page.

1. What does the above mean?
2. How do I resolve the issue?

Any advice would be much appreciated.