Updated contributing documentation about merge conflicts (#4311)
Updated contributing documentation about merge conflicts (#4311)


amyrebecca/Panoptes-Front-End,zooniverse/Panoptes-Front-End,amyrebecca/Panoptes-Front-End,amyrebecca/Panoptes-Front-End