Workaround conflicts between different parts #212

Closed seb128 closed 5 months ago