Update 2
Update Push & Merge
Test Conflict
Update README
Fixed Conflict
Add Optional