Review: Needs Fixing There’s a conflict in src/app/webcontainer/webapp-container.qml when merging into the latest trunk, can you please resolve? -- https://code.launchpad.net/~mardy/webbrowser-app/cookie-manager/+merge/232039 Your team Ubuntu Phablet Team is subscribed to branch lp:webbrowser-app.