android controls
merge conflicts