Debugged merge