Fixed conflict
Edit to changelog