added new aliases
added fix for android studio
fixed conflicts