Removed conflict tokens

removed conflict resolution tokens from feedActivity and feedAdapter