Resolved merge conflicts by reverting tgocasissunstitch and tgocasissstitch files.