setup
resolve conflict