Implement feature to update user's list when a new entry is added
Merge conflict