Merge: Better autoinit conflict message