See bug 1221438, the file conflict will have to be resolved somehow. *** This bug has been marked as a duplicate of bug 1221438 ***