Fixing a merge Conflict