Resolving merge conflicts
Adding temp local variables
Changes to visual studio generated files