Disable conflict resolve for Thess-devel.