playing with annotate library
resolving conflict