I use angular!
master: conflict resolution