Added method removed during conflict resolving