Add conflict basics
Test with Mock Objects and $httpBackend