First try at resolving conflicts with Ubuntu server