Can you remove these commented lines? Then I will merge :) As a rule we just delete lines, because they can always be recovered by rolling back the file version anyway