Fixed conflicts from version vs dev