edit works
fixed merge