fix fastfoward merge