added
minor changes
resolved conflicts + added tests