pulling
merge conflict fixed
outputting weights