sqaush this
If a conflict is detected. Go ahead and revert, then try to build again.