Have a google http://www.google.co.uk/search?q=rails+merge+errors
You don't say what version of Rails you're using, but historically Ihave posted up a solution for 2.3.x