adding new, sample service and unit test
resolving conflicts