added protractor test
removed conflict file