Conflicts & Developer Notes