add python dictionnary and update plugin
merge remote add resolve conflict