Prepare for merge timeout and develop