fix gid
solve conflict