Typo changelog
Fixing an indentation typo
0.4.4
Fixing conflicts