Darn merge conflicts...