fixing unresolved merging conflicts