fixed merge conflicts from develop