utils: resolve conflicts
rawdec: resolve conflcits

compared to nicolas variant this looses 1 hunk (hint in case something doesnt work)