fixed tydec list and fundec list but introduced 2 s/r conflicts WTF
fixed merge issues