* Schema compare tests for updateSourceAndTarget method
* Merge conflict resolution
* Move resetbutton call before adding them to toolbar
* PR comments- added a buttons interface for readability and created a test class to add test functionality to the orginal class
* Moved interface ButtonState to test code
