refactored items
resolved conflicts