Fixed exception which occurs when combo boxes have blank type or priority
Fixed merge conflicts