fixed commit conflicts