Gotto love netbeans for its awesome #git plugin. #ConflictResolution (cc:@roxxypoxxy)