Getting 500 error that is maybe browser problem
Resolved conflicts