This is gonna seem super-pedantic...
I think you should revert the last commit (8de32ab552abf8d33c9829c4a48eea84020b68e7) to the commit before the merge with master (8d8f10f9a962fbecac6e45891fd17b69e6e13fea). The branches had no conflict, so it is not necessary.
This is gonna seem super-pedantic... I think you should revert the last commit (8de32ab552abf8d33c9829c4a48eea84020b68e7) to the commit before the merge with master (8d8f10f9a962fbecac6e45891fd17b69e6e13fea). The branches had no conflict, so it is not necessary.