Updated local changes apply logic.
Updated remote changes apply logic.
Fixed behaviour for remote rename event.