Initial progress toward correctly cataloging comments
Fix conflics