debug after manual merging