Fix

Conflicts in 2048.py and Circuit