Fixed first merge conflict
fixing merge conflict, thanks debbie
fixing merge conflict thanks debbie
fixing merge conflicts, thanks debbie and austin