Modify teuca
resolve merge