fix conflict remnants