add classes after conflicts