fix merge conflicts

apps/admin_dependencies_chk/settings.php

apps/admin_migrate/settings.php

apps/bookmarks/appinfo/info.xml

apps/bookmarks/index.php

apps/bookmarks/settings.php

apps/calendar/ajax/calendar/edit.form.php

apps/calendar/ajax/calendar/edit.php

apps/calendar/ajax/calendar/new.form.php

apps/calendar/ajax/calendar/new.php

apps/calendar/ajax/calendar/overview.php

apps/calendar/ajax/calendar/update.php

apps/calendar/ajax/event/edit.form.php

apps/calendar/ajax/event/new.form.php

apps/calendar/ajax/import/dialog.php

apps/calendar/ajax/share/dropdown.php

apps/calendar/index.php

apps/calendar/lib/object.php

apps/calendar/lib/share.php

apps/calendar/settings.php

apps/calendar/templates/part.choosecalendar.php