[No review required] Resolve merge conflict