fixed all conflice errors