django work
resolve conflicts