changed cascading options to overwrite each other on conflict instead of weird merges