merge conflict
merge conflict
setting up android