updating project 1
Removed metadata folder and resolved merge conflicts.
Re-built metadata folder.