add bca and change news title
fixed conflict file