resolving conflicts
after running autopep8 to manager.py
fixing typos
fixing typos