Adding files I missed out
Resolved merge conflict
Fixed Link Type field to reset using placeholder