base activitity completede working on like unlike
conflict resovled