updated attribute logic
fixed attributes
resolved merge conflicts
Update README.md
Update README.md
Update README.md
Update README.md
merge conflicts