add comments to allow automatic merging to work better