resolved conflicts in ajax views