initial commit
deleted old files
merge fix