update roadmap
resolve merge conflict in readme