resolved conflicts, fixed new_entries logic
↧
resolved conflicts, fixed new_entries logic