merge code from develop before creating a pr