CONFLICT 6/2/2017 - REVIEW