resolving merge
resolving merge2