commented out conflict flag slipped past me