PIE: fix conflict file.