main activity layout and .java
merge