Resolved by: - temporarily discarding their changes when concerning a binary file - .sql files were merged accordingly
Merge branch 'master' into 1579
# Conflicts:
# Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql
# Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
# Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
# Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd
# build/DatabaseStructure.sql
# design/DatabaseDesign.eap