💣

Top-down and macro conflict resolution