Remove remnant merge conflict lines from ansible.spec
Fix changelog dates in ansible.spec