task input bar style
merge conflict