Trying Conflict resolution tool
resolved conflict