practice merge conflicts