adding more dependencies
fixing merge errors