merging all relevant develop files