minor corrections
resolving merge conflicts