added file changes
successfully merged 3 files