Thread:MasterFrown0704/@comment-33719196-20180819230626/@comment-35528501-20180820131422

No, the conflict already stopped a day ago.