resolve bad merge