Prakash,Ajit| resolved activity wall conflicts