changing formula
add ignore file
changing formula
changing formula x
changing formula x
changing formula x
changing formula xzc
changing formula  fix conflict