Separate Folder for Physics Update

I accidentally overwrote the main ReverseRPG so I reverted that upload
(should be back to Ryan's weapons/attacks update now) and have moved my
update to this new folder. Can someone explain how merging is going to
work? Are we splitting  in separate folders then merging them through a
full version of Game Maker?