updating recent changes...
Updating
updating latest crap
merge conflict in .emacs