Fix conflicts, remove important.