fixed ordering problem of getRecentContent
resolving MainActivity conflicts
resolved merge conflict