fixing malresolved merging