No need to press enter anymore
xmms
Merge branch 'master' of github:baabelfish/dotfiles

Conflicts:
	README.md