Remove R.java
Remove R.java in merge conflict