posts so far..
fix layout conflict
conflicts resolved