merge from master into the WIP for this study/author
    this is needed to allow a worker's future saves to
    be merged seamlessly into master

def merge_from_master(git_action, study_id, auth_info, parent_sha):
    """merge from master into the WIP for this study/author
    this is needed to allow a worker's future saves to
    be merged seamlessly into master
    """
    return _merge_from_master(git_action,
                              doc_id=study_id,
                              auth_info=auth_info,
                              parent_sha=parent_sha,
                              doctype_display_name="study")