fix conflicts and delete debug code