amening last commit with manual merge files