use real rm
merge conflicts