change input form
resolve merge conflict