try to make a different merge