Conflict Errors Removed