Fixing diffs with master