Text conflict in indicator/metrics.cpp 1 conflicts encountered. -- https://code.launchpad.net/~unity-api-team/telephony-service/file-based-infographics/+merge/224105 Your team Ubuntu Phablet Team is subscribed to branch lp:telephony-service.