deleting differences with the dev branch