conflict information added by collaborator
merged changes from github, resolved conflict