fallback if merge fails

Ignore-this: d9b92635803c6bc3996c4896344ce0d7

darcs-hash:20140923215117-c21fe-a9cc8bb2f3e828ae882b3aeac7245d0157145dfd