resolve conflict
scheduler controller
resolve conflict
resolve conflict
merge