merge agh_msc and development