Fixes some merge conflicts and updates comments