Removed conflicting views from varshaas merge