Removed merge conflict artifact from jQuery Mobile theme file