this is my alert to notify you of changes to master Bogus 2
I fixed the merge conflicts to master on Bogus 1 branch
fixed conflicts
fixed merge conflicts