I think this is fixed
Removing debug
Removing debug
Removed debug info, resolved comflicts.