change animation to transit
resolve conflict