fix v3 class names
turn off uninitialized error in Android
fix conflict markers in the manifest