replaced project - manual merging