updates #2: Test fix. Add git ignore file.
Resolve conflict.