merge master commits with development branch