merge work of alex & dev