Removing local schema file
resolve merge conflict
Updating Schema
Resolved merge conflict