Remove conflict markers
Convert docstring-y comments to actual comments
Wrap some comments