added removel of ... from disciplne_name
resolved conflicts