Changed wall styling. Also added support for string as picture
Conflict handling