fix xinitrc
Merge