Resolved merge conflicts

@murrayk012000 There are still some files that need to be ignored such as .csproj, sln, and userprefs

However, the conflicts have been resolved!