Open a shell on startup
Open eshell on startup
Update emacs
Turn off fringe
Resolved merge conflict