Eric checked in
Fixed merge conflicts