Resolve conflict in bookmarks file (renamed data/fuck)