fix article test again
fix merge conflict