Cleaned up Conflicting Comments

Whoops...