User upload settings preference is saved to database
Fixed merge conflicts