fixed bad merge from import