Minor editing
Merge resolutions
took out merge conflicts