removing debug stuff
fixing conflicts