resolve merge conflicts for develop branch