updated datamapper setup
Corrected adding_link_spec error
Fixed merge conflict