fixed merge conflict in .xinitrc
vim: added "ruler" at 100 column