day 2 commit 3 l
handle conflict