reaired merge