resolved conflicts; remove Package Control.cache