merged, can you deploy when you have a moment?