before pull
befor mastre merge