Resolving conflict by manually merge.