final merge from old repo