Improving usage statement
Fixing merge conflict.