Fixed data conflicts in localStorage