fixing file merge times 2