Commit conflict rubbish removed.