Fix select box
Fix merge conflict