BF: misinterpreted the conflict message, this should be added, not removed.