adding ignored files
resolving merge conflict