removed border of post images from server, conflict problem
conflict merged