Fix conflict.

3rdparty/MDB2/Driver/mysql.php

3rdparty/phpass/PasswordHash.php

3rdparty/phpass/c/Makefile

3rdparty/phpass/c/crypt_private.c

3rdparty/phpass/test.php

apps/bookmarks/addBm.php

apps/bookmarks/ajax/addBookmark.php

apps/bookmarks/appinfo/app.php

apps/bookmarks/appinfo/database.xml

apps/bookmarks/appinfo/info.xml

apps/bookmarks/bookmarksHelper.php

apps/bookmarks/css/bookmarks.css

apps/bookmarks/js/addBm.js

apps/bookmarks/js/bookmarks.js

apps/bookmarks/lib/search.php

apps/bookmarks/settings.php

apps/bookmarks/templates/addBm.php

apps/bookmarks/templates/bookmarklet.php

apps/bookmarks/templates/list.php

apps/bookmarks/templates/settings.php