commit before upstream merge