SES21 - 2012-03-20

I'd like to ask that, if this isn't possible, that you prompt the user to choose which version to keep when a conflict is encountered. That's actually my preference over keeping both but I could be happy with either solution.