Fixed corruption from merge fail