merge conflict solved