test adding explict develop
fixed merge error