fixed the merge arrows
Merging changes Merge branch 'develop' of https://github.com/CulturePlex/Sylva into develop