Added a second message.
Added a second message.
Made a change with the intent of messing with merging back from a dev branch.
Made a change in dev branch.:x
Resolved a conflict
Attempting to fix a conflict.