added conda_pinned to makefile
update changes