* branch master -> FETCH_HEAD
Updating 3877c3d..da571da
error: The following untracked working tree files would be overwritten by merge:
static/images/google-signin-base.png
static/images/google-signin-hover.png
static/images/google-signin-press.png
Please move or remove them before you can merge.
Aborting