creating a conflict for merge test
Merge branch 'master' of github.com:OrDuan/Min