updated xinitrc
Fixed mess up with merge