Add new command
Fix merge conflict and keep both commands