add more credits and help sources
fix merge conflict