almost got merge to work