Error getting diff: bad link: conflict in file _service

Changes of Revision 77

No source changes.