commented code cannot be merged