removed syntax error caused by conflict
removed syntax error caused by conflict
micahwood/linux-dotfiles,micahwood/linux-dotfiles,micahwood/linux-dotfiles,micahwood/linux-dotfiles,micahwood/linux-dotfiles