Bug 54087 - File conflicts

Summary: File conflicts