trying to pre-emptively fix merge conflict