commit conflict R.java in folder "gen"