resolved warning conflicts