merge messed up