Takes out merge error text
Adds validation.js file
Fixed merge conflict