don't merge commented code into master