fix .gitignore

.gitignore

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # ---> Go
 # Compiled Object files, Static and Dynamic libs (Shared Objects)
 *.o
@@ -27,9 +26,5 @@ _testmain.go
 
 .vscode/
 *.exe
-<<<<<<< HEAD
->>>>>>> 1cc34e1... global gitignore
-=======
 *.o
 */bin/*
->>>>>>> aacc961... all: several makefile corrections and organization steps