Fixed the conflict but I may have lost things, look out for this commit.