fix merge conflict

apps/files/ajax/delete.php

apps/files/ajax/list.php

apps/files/ajax/move.php

apps/files/ajax/newfile.php

apps/files/ajax/newfolder.php

apps/files/ajax/rawlist.php

apps/files/ajax/rename.php

apps/files/ajax/scan.php

apps/files/ajax/upgrade.php

apps/files/ajax/upload.php

apps/files/appinfo/app.php

apps/files/appinfo/filesync.php

apps/files/appinfo/info.xml

apps/files/appinfo/version

apps/files/css/files.css

apps/files/download.php

apps/files/index.php

apps/files/js/files.js

apps/files/js/upgrade.js

apps/files/l10n/bn_BD.php