ability execute commands with contexts
fix merge issue