eliminate a conflict with rebase -- this isn't really a conflict so we'll just take the latest update to this function