remove localization
remove undefined variable notice
merge conflict