Fixed merge conflict
Version 2.8.1