initial commit
fixed unit tests
resolved conflicts