Merge conflict not solved