Clearing commit conflict.