avoid submit on enter
merge conflict