I somehow messed up icons & comits & merges