Use merge for updating feature branches