it's been a bit chaotic, but my branch didn't seem to conflict, so I successfully merged them and if that caused bugs, that's the next guys problem :)
