further merge conflict