gems conflict solve