file merge
add unclock rotate