last step
resolve conflict