didn't clean up the merge properly