merge conflict and working on lab07