seems to work fine with simple merges