commit latest updates from mustafa
resolving conflicts