use mtime and many fixes
resolve merge