Merging both activities