try to fix merging conflict
try to fix merging conflict
Fixed R.java for merge