Resolve merge conflict in comment
See
/*
-<<<<<<< HEAD
- * Copyright 2014-2021 the original author or authors.
-=======
* Copyright 2014-2022 the original author or authors.
->>>>>>> 2.0.x
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
