change key mapping
merge from remote