Fix merge and daily build jenkins job