manually merged master branch into development branch, development branch will become master branch