[Pharo-dev] slice/merge conflict with package AST-FFI-Pharo50Compatibility

I need help with issues 17696 <https://pharo.fogbugz.com/f/cases/17696/RBParser-should-not-allow-variable-n...> RBParser should not allow variable names for pragma arguments 17994 <https://pharo.fogbugz.com/f/cases/17994/RBParserNode-allowed-primitive-pragm...> RBParserNode: allowed primitive pragma definition can not compile for both issues I created a slice that will modify methods from package AST-FFI-Pharo50Compatibility, but merging this slices shows a merge conflict. I don't know what is wrong or how I could solve this. any help appreciated. nicolai