Github Merge Conflict Resolve