Conflict fixed.