Some more diff marks - let me know if you want to go through resolving merge conflicts next week.