Merge and updated neccessary files