added nose.bat, silly me ^^
re-added nose.bat for whoever might need it
worked a tad on the conflict resolution engine