Resolving merge conflict
Fixed integration errors