Ready for Pagoda box w/o sesnsitive files
merge