Add back which lost when resolve conflict