Add conflict solving section