merge with django project