remaining merge conflict solved