fix categories bug
ignore javascript config
pre-merge
merged in path changes