removed pyc and DS_Store
remove
conflict resolving