Let me fix that merge for you git
We removed Xresources
We also removed xsession
Merge remote branch 'origin/root' into root