Forgot to commit the changelog?
Resolve conflict