fixed missing :s in spritedata script
fixed merge problems