Reseting incorrect merge with dev branch