Merge files modified in develop with my local branch