home page desing complete
conflict resolved of tmp and log file