noConflict branch