Punctuation
Resolve conflict