Showtime

I've used git pull today to compile a new Showtime. I get this error:

girish@girish-linux:~/Documents/showtime$ git pull
M glwthemes/mono/popups/auth.view
M src/fileaccess/fa_nativesmb.c
M src/keyring.c
U src/ui/glw/glw_cocoa.m
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.
girish@girish-linux:~/Documents/showtime$

Any help would be very much appreciated, thank you.