More CR Comments
Resolved Conflicts