deleted a stray git merge line that was causing issues with the Django Server causing a Python Syntax Error