fixed django conflict