German rail operator, train drivers end wage dispute