Fixing gitwar stuff
tybenz took turn