Almost final merge!