Resolve form merge conflict.
Users can now upload 3 files at a time.