fix merge conflicts with master