change on master kevin-moorer
fixed conflict