*simplified conflicts and dependencies