fixed conflicts in maplayout directive
fixed conflicts in maplayout directive

codethejason/loklak_webclient,aayusharora/loklak_webclient,loklak/loklak_webclient,loklak/loklak_webclient,codethejason/loklak_webclient,aayusharora/loklak_webclient,loklak/loklak_webclient,aayusharora/loklak_webclient,codethejason/loklak_webclient