Fix some issues after conflict.