deleted annoying merging stuff