Previous merge didn't clean up all the merge tags