minor
conflict solving
vector median filter