Tidy up commit conflict