Always Insert Diff and Fix Upstream = Y