#conflict-free - style