changed to default merge branch