Launch selection activity major updates to activity_main.xml (Mild test
for committing specific files)
Fix merge conflicts
merge and stuff