Remove commented lines before merging