Forcing the merge with dev branch to keep both