commit on dev branch
conflict fixed