phils git lesson was rockin/
Resolve conflict.