initial
fixed conflict
metrics prez