finally using figaro the correct way..I think
fixed merge conflict with local and remote