merging my category changes