Clean up format
remove
resolve conflicts
deleting .pyc files
Breaking things