Git merge conflict resolution

shape