fixed 2.6 conflicts