jabber deleted
magit added
init.el modified for unexisting files
conflict modified