removed github merge error markup