do not merge commented code