Can you fix/rebase this line or is it required to use your fork?