git lied to me!! found a spot where there was another conflict
Merge remote-tracking branch 'origin/wes' into jeff