changed from pull to fetch and merge