Problem with loading project solved
More Conflict Resolution