When there are conflicts the CI fails, as expected, need to strategise the solution for this.
When there are conflicts the CI fails, as expected, need to strategise the solution for this.