remove merge markers - by copying over kwwii's branch