load and save updated
prevent click during drag
Fixed mergeconflict