on the way to zero merge conflicts