changed gif AGAIN
fixed merge conflicts