fix merge conflict mess-up