PocketHealth Heroku Android Webview
resolve conflicts