Fix a conflict during PA merge