Fixed error with 409 and old code
randome shit
merge conflict resolved
updated stuff