set release date
fix conflict
hm...
fix merge fuckup