Create screen xml
Fix merge conflict