resolving conflicts from 6.0