Git Conflict Sloving

Git Conflict Sloving