Fix merge issues
Unit test for timeout_command