crateit-46 Fix duplicated methods from conflict resolution