fix conflicts

src/common/middleware.py

@@ -12,6 +12,7 @@ class CurrentUserMiddleware(object):
         _profile.value = request.user
         return self.get_response(request)
 
+
     #@property
     def get_current_user_profile():
         return _profile.value.profile