try git update and merge