Creating template
Files have been merged