Adding new files
resolving merge