Tryin resolve merging conflicts
Merge branch 'develop'
fix merging problems