Removed git unmerged and fixed git up.