jenkins関係追加
solve conflict