Further merge conflict fixing