Fix merging chaos concerning comments branch