Resolve conflict and apply the code change