Debugged the merge