Fetch and merge master