Go ahead and merge develop into your branch and make fixes