pyc removed
local settings changed
conflict resolved