update .Xresources
fix merge