added no fast forward to merge in readme