added what happened to my block?.tex
inserted what happened to my block?.tex into layout
fix merge conflict