better way to manage merge conflicts