Conflict with older version resolved