fix #040 #023
clean up merged files
merge discard home.html