Mid work commit to solve future merge conflicts