Revert bad conflict solved from last commit