Created this branch to resolve a large amount of merge conflict / errors locally at once.

[DemirInce]

Everything works on this branch, it is basically all my other branches combined.