Added info about upstream merge with version