Merge from separate git