Bug 3870 - conflict with file from other package

Summary: conflict with file from other package