spillet
Fix merging