git wouldn't let me checkout with adding these changes.  Didn't see any
pulled
fixed gemlock conflict