fixed merge conflict remnants