diff --git a/init.lua b/init.lua
index 5746313..96048f5 100644
--- a/init.lua
+++ b/init.lua
@@ -2,15 +2,10 @@
 -- Please remember the lua @ the begining & end of the string are implied.
 -- In other words "user.abbrs" is the same as "lua.user.abbrs" | "user.abbrs.lua" | "lua.user.abbrs.lua".
 require "user.options"
-<<<<<<< HEAD
 -- I have auto-commands for cursor-file persistance,
 -- auto. vertically centering, & auto-saving text-folds.
 require "user.autocmds"
 -- Abbreviations for manual text-replacements.
 -- Populated mostly with a top 100 list of commonly misspelled words.
 require "user.abbrs"
-=======
 require "user.keymaps"
-
-
->>>>>>> e1ac27496fccd2e0accb79c6ac2097865feff14b
diff --git a/lua/user/options.lua b/lua/user/options.lua
index b97731d..e66fa56 100644
--- a/lua/user/options.lua
+++ b/lua/user/options.lua
@@ -1,5 +1,4 @@
 -- :help options
-<<<<<<< HEAD
 local options = {
 -- Display settings:
   fileencoding = "utf-8",                              -- The encoding written to a file.
@@ -41,43 +40,6 @@ local options = {
   ignorecase = true,                                   -- Ignore case in search patterns.
   smartcase = false,                                   -- Overides ignore case, w/ capitals. Default = false.
 }
-=======
-vim.opt.backup = true                           -- Creates a backup file, before edits are written.
-vim.opt.clipboard = "unnamedplus"               -- allows neovim to access the system clipboard
-vim.opt.cmdheight = 2                           -- more space in the neovim command line for displaying messages
-vim.opt.completeopt = { "menuone", "noselect" } -- mostly just for cmp
-vim.opt.conceallevel = 0                        -- so that `` is visible in markdown files
-vim.opt.fileencoding = "utf-8"                  -- the encoding written to a file
-vim.opt.hlsearch = true                         -- highlight all matches on previous search pattern
-vim.opt.ignorecase = true                       -- ignore case in search patterns
-vim.opt.mouse = "a"                             -- allow the mouse to be used in neovim
-vim.opt.pumheight = 10                          -- pop up menu height
-vim.opt.showmode = false                        -- we don't need to see things like -- INSERT -- anymore
-vim.opt.showtabline = 2                         -- always show tabs
-vim.opt.smartcase = true                        -- smart case
-vim.opt.smartindent = true                      -- make indenting smarter again
-vim.opt.splitbelow = true                       -- force all horizontal splits to go below current window
-vim.opt.splitright = true                       -- force all vertical splits to go to the right of current window
-vim.opt.swapfile = false                        -- creates a swapfile
--- vim.opt.termguicolors = true                    -- set term gui colors (most terminals support this)
-vim.opt.timeoutlen = 1000                       -- time to wait for a mapped sequence to complete (in milliseconds)
-vim.opt.undofile = true                         -- enable persistent undo
-vim.opt.updatetime = 300                        -- faster completion (4000ms default)
-vim.opt.writebackup = false                     -- if a file is being edited by another program (or was written to file while editing with another program), it is not allowed to be edited
-vim.opt.expandtab = true                        -- convert tabs to spaces
-vim.opt.shiftwidth = 2                          -- the number of spaces inserted for each indentation
-vim.opt.tabstop = 2                             -- insert 2 spaces for a tab
-vim.opt.cursorline = true                       -- highlight the current line
-vim.opt.number = true                           -- set numbered lines
-vim.opt.relativenumber = false                  -- set relative numbered lines
-vim.opt.numberwidth = 4                         -- set number column width to 2 {default 4}
-vim.opt.signcolumn = "yes"                      -- always show the sign column, otherwise it would shift the text each time
-vim.opt.wrap = false                            -- display lines as one long line
-vim.opt.scrolloff = 8                           -- is one of my fav
-vim.opt.sidescrolloff = 8
-vim.opt.guifont = "monospace:h17"               -- the font used in graphical neovim applications
->>>>>>> 26a3b7e (Enabled backup files.)
-
 -- A lua for-loop to loop through the above table of options.
 -- A table is a list, that is allowed key, value pairs.
   for k, v in pairs(options) do