commenting and uncommenting things :
merged