first view
resolve conflict