0 conflicts!

We changed the COMMA in bar definition2 into SEMI. Now no conflicts