Run Script Merger, when you get prompted with the unsolved conflict click ok, then right click on the yellow line in the bottom section and click "Select line(s) from B", after that right click again the yellow lines and click "Select line(s) from C", save the edits and quit, everything should be working when you launch the game.
Run Script Merger, when you get prompted with the unsolved conflicts click ok, then right click on the yellow line in the bottom section and click "Select line(s) from C", after that right click again the yellow lines and click "Select line(s) from B", this solves the first conflict.
For the second conflict open the "Movement" menu and select "Go to Next Unsolved Conflict", again in the lower section right click on the yellow lines and click "Select line(s) from C", save the edits and quit, everything should be working as intended.
Compatibility (3 comments)
Comments locked
The author has locked this comment topic for the time beingIf you don't know how to use Script Merger you can look at this video:
http://youtu.be/YolaeWk5Dm4?t=9m34s
Run Script Merger, when you get prompted with the unsolved conflict click ok, then right click on the yellow line in the bottom section and click "Select line(s) from B", after that right click again the yellow lines and click "Select line(s) from C", save the edits and quit, everything should be working when you launch the game.
Run Script Merger, when you get prompted with the unsolved conflicts click ok, then right click on the yellow line in the bottom section and click "Select line(s) from C", after that right click again the yellow lines and click "Select line(s) from B", this solves the first conflict.
For the second conflict open the "Movement" menu and select "Go to Next Unsolved Conflict", again in the lower section right click on the yellow lines and click "Select line(s) from C", save the edits and quit, everything should be working as intended.