Feature/update conflict resolution

- Moved Changelog to its own file

- Added a Conflict Resolution section.

tl;dr - The RC files always win.