Feature/conflict