Merging remote
Refactoring
Conflict resolution