Merging dev
Fix merge conflicts
merge confict fix