more and more commands
Conflict fixed