add cmd line option placeholder
resolve merge conflict