Get upstream back in sync with master except for two files