Playground cleanup after a merge conflict