Django app started
fixed unmerged files