fix merge conflicts

remove extra space from previous commit