Resolved product file conflict.