Workaround for ruby 1.9.3 bug in merge