fix unresolved conflict
prefix some variable names with "my/"