appended settings from Android Studio
Fixed merge