Fixed commits ahead and behind and both modified. Save in vim remove
trailing whitespaces