Added a few exclamation points
Resolved conflicts