Fixed Conflict 6