Title: Settle Conflicts Right Now