removed code generated by merge