Remove part conflict indicator...
1 file changed