fixed more merge conflicts
merge conflicts