Version: 2017.3

Description

There is a conflict with the asset that needs to be resolved.