"CONTENT"-issue
resolving conflicts (?)