merge conflict solved?