Merge with meld, remove useless stuff, etc