Fixing partially resolved conflict file