added the initial data file
resolving conflicts