Added pull on start for upstart
Fixed merge conflict