misc, and add .screenrc
fix merge conflicts