Working on refactoring Merge in the web-api.

Added conflicts to the response of status through the web-api.
Added checkout to the web-api.
Updated Merge command to return both the new commit it made and the report for the changes made in that merge.