Fetch from original and fix merging