TRDS: fix conflicts