Attempt at manual merge