git: Fixed invalid merge
server: Fixed checking if any remote was added