add merge and pull option