Propogate changes to src files
Correct merge conflict
Updated Website