Merge conflict solved