Another attempt at manual merging