commit to incorporate changes
merge conflict fix