library can now be imported into Android Studio Beta
fix conflict