resolved more conflicts:keli