Merge Conflict Removed