Conflict Errors fixed--layouts now visible