Merge confllict fixxxed
new playa