merge conflicts sass