resolve bad merged