add schema file change
pull down and resolve merge conflict