Remove unused code in controller, refactor and add tests to merge service
Added tests for updateObs in merge concept service
Merge pull request #3 from albertsaave/master

Removed unused code, and its tests. Added test coverage for updating obs in merge concept service.