fix merge fail

cause sitting between chair and keyboard