added usability tweaks
merge conflict resolution