fixed a last conflict for the last commit