fix after merge

.htaccess

@@ -7,18 +7,18 @@
 ## Common PHP Overrides
 #
 # Some of the most common settings that can (sometimes) be overridden.
-php_value memory_limit 256M
-php_value post_max_size 16M
-php_value max_execution_time 90
-php_value max_input_time 120
-php_value upload_max_filesize 16M
-php_value realpath_cache_size 16M
+# php_value memory_limit 256M
+# php_value post_max_size 16M
+# php_value max_execution_time 90
+# php_value max_input_time 120
+# php_value upload_max_filesize 16M
+# php_value realpath_cache_size 16M
 
 <IfModule mod_rewrite.c>
 
 RewriteEngine On
 
-RewriteBase /flextype/
+RewriteBase /
 
 ## Begin - Exploits
 # If you experience problems on your site block out the operations listed below

README.md

@@ -1,10 +1,4 @@
-<<<<<<< HEAD
 <img src="https://images2.imgbox.com/49/8d/4ipHqUcj_o.jpg" alt="Flextype" align="center">
-=======
-<h1 align="center">SELF-HOSTED DATA-FIRST HEADLESS CMS & API.</h1>
-
-![preview](https://flextype.org/api/images/en/flextype-banner.jpg?dpr=2&w=1000&q=70&token=3b29b31ae05c89c2009f6e3f96e3d703)
->>>>>>> origin/master
 
 <p align="center">
 <a href="https://github.com/flextype/flextype/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype/flextype.svg?label=version&color=black"></a> <a href="https://github.com/flextype/flextype"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype/flextype"><img src="https://img.shields.io/github/downloads/flextype/flextype/total.svg?color=black" alt="Total downloads"></a> <a href="https://scrutinizer-ci.com/g/flextype/flextype?branch=master"><img src="https://img.shields.io/scrutinizer/g/flextype/flextype.svg?branch=master&color=black" alt="Quality Score"></a> <a href="https://flextype.org/en/discord"><img src="https://img.shields.io/discord/423097982498635778.svg?logo=discord&color=black&label=Discord%20Chat" alt="Discord"></a>