Committing before merge with remote
finishing merge
fixing self.debug reference