The textArea fix (wasn't commited for some reason)
conflict :(