merge mess up