P4: A conflicting edit against bar from P4.
The merged results from GutHub P4 conflict