Updated changelog, hopefully fixed merge conflict?