installing merge tool
some message
conflict
cleanup test files.
Updates to Presenter page.