debugged merge