video arrow icon alognment
merge code and resolve conflict
git resolve
git resolve