Merge from fork to branch