making branch merges easier