Merge my fork into single branch