top layout design merge
top layout design modify
top layout design modify
conflict fix and merge complete
add *.log for .gitignore