diff --git a/mysqltuner.pl b/mysqltuner.pl
old mode 100755
new mode 100644
index a1c3a83..518286c
--- a/mysqltuner.pl
+++ b/mysqltuner.pl
@@ -6671,5 +6671,4 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # indent-tabs-mode: t
 # cperl-indent-level: 8
 # perl-indent-level: 8
-# End:
->>>>>>> 094f16f67cdd90b9e5b08da8bd3e525aa59749d2
+# End:
\ No newline at end of file