remove debugger
fix merge conflicts