Pull upstream and fix merge conflicts