Added fast forward merge (o) option