Fix apt-get - wrong merge