Fix last conflict

Credits to Mahdi-Rom