remove .rej
config: sync with cm