Fix command bug.
Fix conflicts.