Fix git commits conflict.