add command
merge conflict with basrc