Integration of all modules
Resolve Conflict