link to some other resources
merge conflict