Merge conflict for local storage