fixed commit merge issues