adding files for tests on import
resolving conflicts