program page merge conflict fix?