How To Handle Merge Conflict