fixing commit conflicts