Fix merge issue in ultimaker settings