Changing committer to author date, and DJANGO_COLORS
merging
merge conflict