Update PreviewActivity.java
Update AndroidManifest.xml
Resolved some conflicts...