Error getting diff: bad link: conflict in file _service

Changes of Revision 134

No source changes.