added map activity
fixed merge conflicts