Registration single: remove git conflict message