Gem file skipped wile resolving conflict