merge back the latest branch