doublechecked all files so that you haven't forgotten to upload a file into proper directory?

if files beeing merged, merged the files and not missed something out?

user tracking config, should come up in under admin config, and under tools.