Merge from forked repository