Fixed a bunch of merge difficulties in unity.