Conflict merges fixed