latest card page update
resolve conflict