got rid of weird conflicts?