Added my activity linked from the main activity
Fixed merge conflicts