merge for commit
merge conflict
add comment and optimise imports
add comment in SkinViewHolder.java