Fixed left over conflict mark