added little merging when file is newer