implemented TakeOriginal for conflict resolving
Added button to view to keep server version
implemented TakeRequested for conflict resolving