merging the development branch