add additional field inputs
resolve merge conflict