Changes for test purposes
Added Brand/Category check
fixed merge conflicts