New branch changes
dev branch change
git dev change2
fixed conflict