Comments, Cleaned Up Conflicts from Merge