merge from old git