fix new conflict