Merge from old git repo