Fixed merge conflict while adding aburrel's changes.