wops, nitrous editor wasnt showing the conflict tags, fixed conflicts