ran bundle to fix merge conflict