make git merge a function
updates
Fix rakefile