Going to use taskpaper instead of bugseverywhere.
conflict resolution