edited davefile again
Fixed merge conflicts