Version: 2018.1

Description

Files conflicted.