Fixed bug with parking layout
Merge