Re-applying changes, my last changes where overriden