fix merge failure
fix focus position