Fixing merge conflicts in order to merge internet lab.