Finished resolve conflict.