fixing the partial
merge conflicts