What was the name of the conditional surrender that ended fighting on the western front?