Merge develop into master so that they are in sync