fixed flake conflics