Commiting the code to pull, web service still not working
merge conflict
finished web service
merge again