more test commands
resolve comflict