Fix bugs
merge branches
Fix bug
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Add edits card