manually merged some changes

Some changes were not correctly committed to GIT, so we had to merge manually.