The first proposal has been merged