attempt to properly sync upstream and master