merge gp changes