Refactor CONFLICTS handling stuff into dedicated function