trailing update
resolving conflicts