Thread:MilkMC/@comment-37129757-20181027113713/@comment-37129757-20181106000546

We both resolved our conflict now :)