Remove merge mess