resolved old conflict