merge conflict in mypis_shell.jsf and web.xml