Merging File Issues

Fixed Merges in script and jade templates