Add upstream merge files