2) Commented out the unless statement. I did not understand why it was there, and it may have made sense, but as there was no case specified for when we are doing a merge, I think this would have failed trying to render a non existing view. 

So this may be modified to put the unless statement again, but we must provide a response to a merge I guess.