merged next & conflict resolved on version number