conflicts resolved both branches merged