modify shell.org
fix git conflicts