add offline capabilities
correct conflict