after conflicts fix