Merge with forked branch